more windows and osx build fixes

diff --git a/Assistant/Upgrade.hs b/Assistant/Upgrade.hs
index 40bef041a1140bb3838642f9fe0599c7abefa2b1..1440af10d0c1d465dcfdaaf389adaabda3e1260f 100644 (file)
--- a/Assistant/Upgrade.hs
+++ b/Assistant/Upgrade.hs
@@ -165,7 +165,7 @@ upgradeToDistribution newdir cleanup distributionfile = do
        {- OS X uses a dmg, so mount it, and copy the contents into place. -}
        unpack = liftIO $ do
                olddir <- oldVersionLocation
-               withTmpDirIn (parentDir newdir) (toOsPath "git-annex.upgrade") $ \tmpdir -> do
+               withTmpDirIn (fromRawFilePath (parentDir (toRawFilePath newdir))) (toOsPath (toRawFilePath "git-annex.upgrade")) $ \tmpdir -> do
                        void $ boolSystem "hdiutil"
                                [ Param "attach", File distributionfile
                                , Param "-mountpoint", File tmpdir

diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index 763028e7dc215932c5287f6473923e0bbec25c05..c7f5fe76447751f8f947a80f94649484c6544aa7 100644 (file)
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -182,7 +182,7 @@ feedRead cmd params passphrase feeder reader = do
        withTmpFile (toOsPath "gpg") $ \tmpfile h -> do
                liftIO $ B.hPutStr h passphrase
                liftIO $ hClose h
-               let passphrasefile = [Param "--passphrase-file", File (fromosPath tmpfile)]
+               let passphrasefile = [Param "--passphrase-file", File (fromOsPath tmpfile)]
                go $ passphrasefile ++ params
 #endif
   where

diff --git a/Utility/StatelessOpenPGP.hs b/Utility/StatelessOpenPGP.hs
index d3709baa276d83573da561843f95b9f4c55e8e1f..205fa91ff8c2351d5fd1759be5b6e1de85f5f42c 100644 (file)
--- a/Utility/StatelessOpenPGP.hs
+++ b/Utility/StatelessOpenPGP.hs
@@ -27,7 +27,6 @@ import System.Posix.Types
 import System.Posix.IO
 #else
 import Utility.Tmp
-import Utility.OsPath
 #endif
 import Utility.Tmp.Dir
 import Author